From 0b8d03f17950526a5e6ffd1088e47724e784ee99 Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Fri, 13 Aug 2004 09:06:20 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.48 (411c848c0EDRT7eJdbiXsiM284ZIbA) 2.6 blkfront fixes --- linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c index 7cccda2072..bcf84d61e9 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -69,12 +69,15 @@ static inline void flush_requests(void); static void kick_pending_request_queues(void); +int __init xlblk_init(void); + /************************** KERNEL VERSION 2.6 **************************/ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #define DISABLE_SCATTERGATHER() +__initcall(xlblk_init); int blkif_open(struct inode *inode, struct file *filep) { @@ -322,12 +325,12 @@ static irqreturn_t blkif_int(int irq, void *dev_id, struct pt_regs *ptregs) case BLKIF_OP_READ: case BLKIF_OP_WRITE: if ( unlikely(bret->status != BLKIF_RSP_OKAY) ) - DPRINTK("Bad return from blkdev data request: %lx\n", + DPRINTK("Bad return from blkdev data request: %x\n", bret->status); req = (struct request *)bret->id; if ( unlikely(end_that_request_first (req, - (bret->status != BLKIF_RSP_OKAY), + (bret->status == BLKIF_RSP_OKAY), req->hard_nr_sectors)) ) BUG(); end_that_request_last(req); @@ -1145,7 +1148,6 @@ int __init xlblk_init(void) return 0; } -__initcall(xlblk_init); void blkdev_suspend(void) { -- 2.30.2